From 51c837e046d8ce4804e07f2c183ebfd20122b77e Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Thu, 27 Aug 2020 12:05:37 -0600 Subject: [PATCH] fix hiketech datetime bug, prepare for toTime_t override (#638) * correct hiketech written time values. the mystery previously noted in the code was due to the use of the %I format specifier which prints out the hour using a 12 hour clock. note that it is easy to see the times in the reference files were wrong. the times in the first reference file, expertgpx.gpx, are in UTC. This is always true for gpx, and is indicated as well by the Z. the times in the hiketech file appear in a utc element, so they must be in UTC as well. this eliminates the usage of QDateTime::toTime_t which is obsolete. * elimnate remaining uses of obsolete QDateTime::toTime_t This sounds better than it is, we added uses of gpsbabel::DateTime::toTime_t. But we control that and can add our own toTime_t. --- hiketech.cc | 12 +- mmo.cc | 2 +- reference/hiketech.gpx | 128 +- reference/hiketech.ref | 3056 ++++++++++++++++++++-------------------- trackfilter.cc | 6 +- trackfilter.h | 4 +- 6 files changed, 1599 insertions(+), 1609 deletions(-) diff --git a/hiketech.cc b/hiketech.cc index ebae53697..cd3f02e3f 100644 --- a/hiketech.cc +++ b/hiketech.cc @@ -128,17 +128,7 @@ hiketech_trk_tlr(const route_head*) static QString hiketech_format_time(const QDateTime& t) { - // FIXME: Find out why these two blocks of code aren't equivalent. - // it produces times that are 12 hours too late. Double TZ bump? - // for now, just go back to the way we've done it for a decade. -- robert -#if 0 - return t.toString("yyyy-MM-dd hh:mm:ss"); -#else - char tbuf[80]; - time_t tm = t.toTime_t(); - strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %I:%M:%S", gmtime(&tm)); - return QString(tbuf); -#endif + return t.toUTC().toString("yyyy-MM-dd hh:mm:ss"); } static void diff --git a/mmo.cc b/mmo.cc index 4a8157ca3..de303431a 100644 --- a/mmo.cc +++ b/mmo.cc @@ -1300,7 +1300,7 @@ mmo_write_rte_head_cb(const route_head* rte) mmo_rte = rte; foreach (const Waypoint* wpt, rte->waypoint_list) { - QDateTime t = wpt->GetCreationTime(); + gpsbabel::DateTime t = wpt->GetCreationTime(); if ((t.isValid()) && (t.toTime_t() < time)) { time = t.toTime_t(); } diff --git a/reference/hiketech.gpx b/reference/hiketech.gpx index 4d31bfb04..3f2fb316d 100644 --- a/reference/hiketech.gpx +++ b/reference/hiketech.gpx @@ -522,207 +522,207 @@ 1.000 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 2.000 - + - + 1.000 - + - + - + - + - + 2.000 - + 1.000 - + 1.000 - + - + 2.000 - + - + - + - + - + - + 6.000 - + 2.000 - + - + - + - + - + 1.000 - + - + - + 6.000 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 7.000 - + - + - + - + - + - + - + - + diff --git a/reference/hiketech.ref b/reference/hiketech.ref index 7082a81ff..000038c91 100644 --- a/reference/hiketech.ref +++ b/reference/hiketech.ref @@ -1,1530 +1,1530 @@ - - - - 2002-05-25 05:06:21 - 30.062183 - -91.610350 - 1.000000 - - - 2002-05-25 05:09:55 - 30.062783 - -91.610567 - - - 2002-05-25 05:12:00 - 30.062700 - -91.608267 - - - 2002-05-25 05:12:48 - 30.062333 - -91.607383 - - - 2002-05-25 05:14:41 - 30.061533 - -91.605283 - - - 2002-05-25 05:17:16 - 30.059783 - -91.599400 - - - 2002-05-25 05:17:46 - 30.057800 - -91.596683 - - - 2002-05-25 05:18:20 - 30.055383 - -91.594900 - - - 2002-05-25 05:19:01 - 30.053883 - -91.592617 - - - 2002-05-25 05:20:46 - 30.049733 - -91.589750 - - - 2002-05-25 05:21:10 - 30.049017 - -91.589883 - - - 2002-05-25 05:21:51 - 30.048800 - -91.592933 - - - 2002-05-25 05:22:35 - 30.046233 - -91.596450 - - - 2002-05-25 05:23:08 - 30.045517 - -91.598717 - - - 2002-05-25 06:04:23 - 30.047300 - -91.600267 - - - 2002-05-25 06:06:04 - 30.047000 - -91.599633 - 2.000000 - - - 2002-05-25 06:07:06 - 30.046433 - -91.599467 - - - 2002-05-25 06:08:18 - 30.046200 - -91.598950 - 1.000000 - - - 2002-05-25 06:10:20 - 30.046367 - -91.597733 - - - 2002-05-25 06:11:09 - 30.046350 - -91.597167 - - - 2002-05-25 06:12:18 - 30.046783 - -91.596333 - - - 2002-05-25 06:14:22 - 30.047450 - -91.595200 - - - 2002-05-25 06:15:04 - 30.047800 - -91.594767 - 2.000000 - - - 2002-05-25 06:16:14 - 30.048250 - -91.594083 - 1.000000 - - - 2002-05-25 06:17:01 - 30.048683 - -91.593800 - 1.000000 - - - 2002-05-25 06:18:07 - 30.049350 - -91.593850 - - - 2002-05-25 06:19:51 - 30.050317 - -91.593983 - 2.000000 - - - 2002-05-25 06:20:39 - 30.050783 - -91.594117 - - - 2002-05-25 06:21:24 - 30.051233 - -91.594367 - - - 2002-05-25 06:22:17 - 30.051800 - -91.594367 - - - 2002-05-25 06:23:18 - 30.052217 - -91.594667 - - - 2002-05-25 06:24:37 - 30.053017 - -91.594683 - - - 2002-05-25 06:28:13 - 30.054867 - -91.595200 - 6.000000 - - - 2002-05-25 06:31:36 - 30.053733 - -91.594933 - 2.000000 - - - 2002-05-25 06:32:56 - 30.053183 - -91.594783 - - - 2002-05-25 06:34:02 - 30.052633 - -91.594833 - - - 2002-05-25 06:36:03 - 30.052450 - -91.595433 - - - 2002-05-25 06:36:48 - 30.052483 - -91.595967 - - - 2002-05-25 06:37:52 - 30.052650 - -91.596783 - 1.000000 - - - 2002-05-25 06:39:18 - 30.053133 - -91.597850 - - - 2002-05-25 06:40:15 - 30.053617 - -91.597967 - - - 2002-05-25 06:41:25 - 30.053967 - -91.597767 - 6.000000 - - - 2002-05-25 06:42:37 - 30.053617 - -91.598083 - - - 2002-05-25 06:44:01 - 30.053200 - -91.597917 - - - 2002-05-25 06:45:53 - 30.052817 - -91.597517 - - - 2002-05-25 06:46:54 - 30.052567 - -91.596933 - - - 2002-05-25 06:47:42 - 30.052333 - -91.596433 - - - 2002-05-25 06:48:41 - 30.052250 - -91.595683 - - - 2002-05-25 06:49:52 - 30.052217 - -91.595017 - - - 2002-05-25 06:50:49 - 30.051883 - -91.594700 - - - 2002-05-25 06:52:14 - 30.051050 - -91.594400 - - - 2002-05-25 06:52:56 - 30.050567 - -91.594233 - - - 2002-05-25 06:53:38 - 30.050183 - -91.594100 - - - 2002-05-25 06:55:11 - 30.049100 - -91.593717 - - - 2002-05-25 06:56:32 - 30.048450 - -91.594250 - - - 2002-05-25 06:57:24 - 30.048083 - -91.594750 - - - 2002-05-25 06:58:40 - 30.047500 - -91.595450 - 7.000000 - - - 2002-05-25 06:59:28 - 30.047067 - -91.596000 - - - 2002-05-25 07:00:22 - 30.046633 - -91.596600 - - - 2002-05-25 07:01:41 - 30.046400 - -91.597650 - - - 2002-05-25 07:02:48 - 30.046233 - -91.598467 - - - 2002-05-25 07:03:43 - 30.046317 - -91.598967 - - - 2002-05-25 07:04:49 - 30.046783 - -91.599283 - - - 2002-05-25 07:05:57 - 30.047133 - -91.599667 - - - - 2002-05-25 05:06:21 - 30.062183 - -91.610350 - 1.000000 - - - 2002-05-25 05:09:55 - 30.062783 - -91.610567 - - - 2002-05-25 05:12:00 - 30.062700 - -91.608267 - - - 2002-05-25 05:12:48 - 30.062333 - -91.607383 - - - 2002-05-25 05:14:41 - 30.061533 - -91.605283 - - - 2002-05-25 05:17:16 - 30.059783 - -91.599400 - - - 2002-05-25 05:17:46 - 30.057800 - -91.596683 - - - 2002-05-25 05:18:20 - 30.055383 - -91.594900 - - - 2002-05-25 05:19:01 - 30.053883 - -91.592617 - - - 2002-05-25 05:20:46 - 30.049733 - -91.589750 - - - 2002-05-25 05:21:10 - 30.049017 - -91.589883 - - - 2002-05-25 05:21:51 - 30.048800 - -91.592933 - - - 2002-05-25 05:22:35 - 30.046233 - -91.596450 - - - 2002-05-25 05:23:08 - 30.045517 - -91.598717 - - - 2002-05-25 06:04:23 - 30.047300 - -91.600267 - - - 2002-05-25 06:06:04 - 30.047000 - -91.599633 - 2.000000 - - - 2002-05-25 06:07:06 - 30.046433 - -91.599467 - - - 2002-05-25 06:08:18 - 30.046200 - -91.598950 - 1.000000 - - - 2002-05-25 06:10:20 - 30.046367 - -91.597733 - - - 2002-05-25 06:11:09 - 30.046350 - -91.597167 - - - 2002-05-25 06:12:18 - 30.046783 - -91.596333 - - - 2002-05-25 06:14:22 - 30.047450 - -91.595200 - - - 2002-05-25 06:15:04 - 30.047800 - -91.594767 - 2.000000 - - - 2002-05-25 06:16:14 - 30.048250 - -91.594083 - 1.000000 - - - 2002-05-25 06:17:01 - 30.048683 - -91.593800 - 1.000000 - - - 2002-05-25 06:18:07 - 30.049350 - -91.593850 - - - 2002-05-25 06:19:51 - 30.050317 - -91.593983 - 2.000000 - - - 2002-05-25 06:20:39 - 30.050783 - -91.594117 - - - 2002-05-25 06:21:24 - 30.051233 - -91.594367 - - - 2002-05-25 06:22:17 - 30.051800 - -91.594367 - - - 2002-05-25 06:23:18 - 30.052217 - -91.594667 - - - 2002-05-25 06:24:37 - 30.053017 - -91.594683 - - - 2002-05-25 06:28:13 - 30.054867 - -91.595200 - 6.000000 - - - 2002-05-25 06:31:36 - 30.053733 - -91.594933 - 2.000000 - - - 2002-05-25 06:32:56 - 30.053183 - -91.594783 - - - 2002-05-25 06:34:02 - 30.052633 - -91.594833 - - - 2002-05-25 06:36:03 - 30.052450 - -91.595433 - - - 2002-05-25 06:36:48 - 30.052483 - -91.595967 - - - 2002-05-25 06:37:52 - 30.052650 - -91.596783 - 1.000000 - - - 2002-05-25 06:39:18 - 30.053133 - -91.597850 - - - 2002-05-25 06:40:15 - 30.053617 - -91.597967 - - - 2002-05-25 06:41:25 - 30.053967 - -91.597767 - 6.000000 - - - 2002-05-25 06:42:37 - 30.053617 - -91.598083 - - - 2002-05-25 06:44:01 - 30.053200 - -91.597917 - - - 2002-05-25 06:45:53 - 30.052817 - -91.597517 - - - 2002-05-25 06:46:54 - 30.052567 - -91.596933 - - - 2002-05-25 06:47:42 - 30.052333 - -91.596433 - - - 2002-05-25 06:48:41 - 30.052250 - -91.595683 - - - 2002-05-25 06:49:52 - 30.052217 - -91.595017 - - - 2002-05-25 06:50:49 - 30.051883 - -91.594700 - - - 2002-05-25 06:52:14 - 30.051050 - -91.594400 - - - 2002-05-25 06:52:56 - 30.050567 - -91.594233 - - - 2002-05-25 06:53:38 - 30.050183 - -91.594100 - - - 2002-05-25 06:55:11 - 30.049100 - -91.593717 - - - 2002-05-25 06:56:32 - 30.048450 - -91.594250 - - - 2002-05-25 06:57:24 - 30.048083 - -91.594750 - - - 2002-05-25 06:58:40 - 30.047500 - -91.595450 - 7.000000 - - - 2002-05-25 06:59:28 - 30.047067 - -91.596000 - - - 2002-05-25 07:00:22 - 30.046633 - -91.596600 - - - 2002-05-25 07:01:41 - 30.046400 - -91.597650 - - - 2002-05-25 07:02:48 - 30.046233 - -91.598467 - - - 2002-05-25 07:03:43 - 30.046317 - -91.598967 - - - 2002-05-25 07:04:49 - 30.046783 - -91.599283 - - - 2002-05-25 07:05:57 - 30.047133 - -91.599667 - - - 5066 - Crossing - 42.438878 - -71.119277 - - FAFFB4 - FF8000 - - - - 5067 - Dot - 42.439227 - -71.119689 - - FAFFB4 - FF8000 - - - - 5096 - Dot - 42.438917 - -71.116146 - - FAFFB4 - FF8000 - - - - 5142 - Dot - 42.443904 - -71.122044 - - FAFFB4 - FF8000 - - - - 5156 - Dot - 42.447298 - -71.121447 - - FAFFB4 - FF8000 - - - - 5224 - Dot - 42.454873 - -71.125094 - - FAFFB4 - FF8000 - - - - 5229 - Dot - 42.459079 - -71.124988 - - FAFFB4 - FF8000 - - - - 5237 - Dot - 42.456979 - -71.124474 - - FAFFB4 - FF8000 - - - - 5254 - Dot - 42.454401 - -71.120990 - - FAFFB4 - FF8000 - - - - 5258 - Dot - 42.451442 - -71.121746 - - FAFFB4 - FF8000 - - - - 5264 - Dot - 42.454404 - -71.120660 - - FAFFB4 - FF8000 - - - - 526708 - Dot - 42.457761 - -71.121045 - - FAFFB4 - FF8000 - - - - 526750 - Dot - 42.457089 - -71.120313 - - FAFFB4 - FF8000 - - - - 527614 - Dot - 42.456592 - -71.119676 - - FAFFB4 - FF8000 - - - - 527631 - Dot - 42.456252 - -71.119356 - - FAFFB4 - FF8000 - - - - 5278 - Dot - 42.458148 - -71.119135 - - FAFFB4 - FF8000 - - - - 5289 - Dot - 42.459377 - -71.117693 - - FAFFB4 - FF8000 - - - - 5374FIRE - Dot - 42.464183 - -71.119828 - - FAFFB4 - FF8000 - - - - 5376 - Dot - 42.465650 - -71.119399 - - FAFFB4 - FF8000 - - - - 6006 - Dot - 42.439018 - -71.114456 - - FAFFB4 - FF8000 - - - - 6006BLUE - Dot - 42.438594 - -71.114803 - - FAFFB4 - FF8000 - - - - 6014MEADOW - Dot - 42.436757 - -71.113223 - - FAFFB4 - FF8000 - - - - 6029 - Dot - 42.441754 - -71.113220 - - FAFFB4 - FF8000 - - - - 6053 - Dot - 42.436243 - -71.109075 - - FAFFB4 - FF8000 - - - - 6066 - Dot - 42.439250 - -71.107500 - - FAFFB4 - FF8000 - - - - 6067 - Dot - 42.439764 - -71.107582 - - FAFFB4 - FF8000 - - - - 6071 - Dot - 42.434766 - -71.105874 - - FAFFB4 - FF8000 - - - - 6073 - Dot - 42.433304 - -71.106599 - - FAFFB4 - FF8000 - - - - 6084 - Dot - 42.437338 - -71.104772 - - FAFFB4 - FF8000 - - - - 6130 - Dot - 42.442196 - -71.110975 - - FAFFB4 - FF8000 - - - - 6131 - Dot - 42.442981 - -71.111441 - - FAFFB4 - FF8000 - - - - 6153 - Dot - 42.444773 - -71.108882 - - FAFFB4 - FF8000 - - - - 6171 - Dot - 42.443592 - -71.106301 - - FAFFB4 - FF8000 - - - - 6176 - Dot - 42.447804 - -71.106624 - - FAFFB4 - FF8000 - - - - 6177 - Dot - 42.448448 - -71.106158 - - FAFFB4 - FF8000 - - - - 6272 - Dot - 42.453415 - -71.106783 - - FAFFB4 - FF8000 - - - - 6272 - Dot - 42.453434 - -71.107253 - - FAFFB4 - FF8000 - - - - 6278 - Dot - 42.458298 - -71.106771 - - FAFFB4 - FF8000 - - - - 6280 - Dot - 42.451430 - -71.105413 - - FAFFB4 - FF8000 - - - - 6283 - Dot - 42.453845 - -71.105206 - - FAFFB4 - FF8000 - - - - 6289 - Dot - 42.459986 - -71.106170 - - FAFFB4 - FF8000 - - - - 6297 - Dot - 42.457616 - -71.105116 - - FAFFB4 - FF8000 - - - - 6328 - Dot - 42.467110 - -71.113574 - - FAFFB4 - FF8000 - - - - 6354 - Dot - 42.464202 - -71.109863 - - FAFFB4 - FF8000 - - - - 635722 - Dot - 42.466459 - -71.110067 - - FAFFB4 - FF8000 - - - - 635783 - Dot - 42.466557 - -71.109410 - - FAFFB4 - FF8000 - - - - 6373 - Dot - 42.463495 - -71.107117 - - FAFFB4 - FF8000 - - - - 6634 - Dot - 42.401051 - -71.110241 - - FAFFB4 - FF8000 - - - - 6979 - Dot - 42.432621 - -71.106532 - - FAFFB4 - FF8000 - - - - 6997 - Dot - 42.431033 - -71.107883 - - FAFFB4 - FF8000 - - - - BEAR HILL - Tall Tower - 42.465687 - -71.107360 - - FAFFB4 - FF8000 - - - - BELLEVUE - Parking Area - 42.430950 - -71.107628 - - FAFFB4 - FF8000 - - - - 6016 - Waypoint - 42.438666 - -71.114079 - - FAFFB4 - FF8000 - - - - 5236BRIDGE - Bridge - 42.456469 - -71.124651 - - FAFFB4 - FF8000 - - - - 5376BRIDGE - Bridge - 42.465759 - -71.119815 - - FAFFB4 - FF8000 - - - - 6181CROSS - Crossing - 42.442993 - -71.105878 - - FAFFB4 - FF8000 - - - - 6042CROSS - Crossing - 42.435472 - -71.109664 - - FAFFB4 - FF8000 - - - - DARKHOLLPO - Fishing Area - 42.458516 - -71.103646 - - FAFFB4 - FF8000 - - - - 6121DEAD - Danger Area - 42.443109 - -71.112675 - - FAFFB4 - FF8000 - - - - 5179DEAD - Danger Area - 42.449866 - -71.119298 - - FAFFB4 - FF8000 - - - - 5299DEAD - Danger Area - 42.459629 - -71.116524 - - FAFFB4 - FF8000 - - - - 5376DEAD - Danger Area - 42.465485 - -71.119148 - - FAFFB4 - FF8000 - - - - 6353DEAD - Danger Area - 42.462776 - -71.109986 - - FAFFB4 - FF8000 - - - - 6155DEAD - Danger Area - 42.446793 - -71.108784 - - FAFFB4 - FF8000 - - - - GATE14 - Truck Stop - 42.451204 - -71.126602 - - FAFFB4 - FF8000 - - - - GATE16 - Truck Stop - 42.458499 - -71.122078 - - FAFFB4 - FF8000 - - - - GATE17 - Truck Stop - 42.459376 - -71.119238 - - FAFFB4 - FF8000 - - - - GATE19 - Truck Stop - 42.466353 - -71.119240 - - FAFFB4 - FF8000 - - - - GATE21 - Truck Stop - 42.468655 - -71.107697 - - FAFFB4 - FF8000 - - - - GATE24 - Truck Stop - 42.456718 - -71.102973 - - FAFFB4 - FF8000 - - - - GATE5 - Truck Stop - 42.430847 - -71.107690 - - FAFFB4 - FF8000 - - - - GATE6 - Waypoint - 42.431240 - -71.109236 - - FAFFB4 - FF8000 - - - - 6077LOGS - Amusement Park - 42.439502 - -71.106556 - - FAFFB4 - FF8000 - - - - 5148NANEPA - Waypoint - 42.449765 - -71.122320 - - FAFFB4 - FF8000 - - - - 5267OBSTAC - Amusement Park - 42.457388 - -71.119845 - - FAFFB4 - FF8000 - - - - PANTHRCAVE - Tunnel - 42.434980 - -71.109942 - - FAFFB4 - FF8000 - - - - 5252PURPLE - Summit - 42.453256 - -71.121211 - - FAFFB4 - FF8000 - - - - 5287WATER - Swimming Area - 42.457734 - -71.117481 - - FAFFB4 - FF8000 - - - - 5239ROAD - Truck Stop - 42.459278 - -71.124574 - - FAFFB4 - FF8000 - - - - 5278ROAD - Truck Stop - 42.458782 - -71.118991 - - FAFFB4 - FF8000 - - - - 5058ROAD - Dot - 42.439993 - -71.120925 - - FAFFB4 - FF8000 - - - - SHEEPFOLD - Parking Area - 42.453415 - -71.106782 - - FAFFB4 - FF8000 - - - - SOAPBOX - Cemetery - 42.455956 - -71.107483 - - FAFFB4 - FF8000 - - - - 5376STREAM - Bridge - 42.465913 - -71.119328 - - FAFFB4 - FF8000 - - - - 5144SUMMIT - Summit - 42.445359 - -71.122845 - - FAFFB4 - FF8000 - - - - 5150TANK - Museum - 42.441727 - -71.121676 - - FAFFB4 - FF8000 - - - + + + + 2002-05-25 17:06:21 + 30.062183 + -91.610350 + 1.000000 + + + 2002-05-25 17:09:55 + 30.062783 + -91.610567 + + + 2002-05-25 17:12:00 + 30.062700 + -91.608267 + + + 2002-05-25 17:12:48 + 30.062333 + -91.607383 + + + 2002-05-25 17:14:41 + 30.061533 + -91.605283 + + + 2002-05-25 17:17:16 + 30.059783 + -91.599400 + + + 2002-05-25 17:17:46 + 30.057800 + -91.596683 + + + 2002-05-25 17:18:20 + 30.055383 + -91.594900 + + + 2002-05-25 17:19:01 + 30.053883 + -91.592617 + + + 2002-05-25 17:20:46 + 30.049733 + -91.589750 + + + 2002-05-25 17:21:10 + 30.049017 + -91.589883 + + + 2002-05-25 17:21:51 + 30.048800 + -91.592933 + + + 2002-05-25 17:22:35 + 30.046233 + -91.596450 + + + 2002-05-25 17:23:08 + 30.045517 + -91.598717 + + + 2002-05-25 18:04:23 + 30.047300 + -91.600267 + + + 2002-05-25 18:06:04 + 30.047000 + -91.599633 + 2.000000 + + + 2002-05-25 18:07:06 + 30.046433 + -91.599467 + + + 2002-05-25 18:08:18 + 30.046200 + -91.598950 + 1.000000 + + + 2002-05-25 18:10:20 + 30.046367 + -91.597733 + + + 2002-05-25 18:11:09 + 30.046350 + -91.597167 + + + 2002-05-25 18:12:18 + 30.046783 + -91.596333 + + + 2002-05-25 18:14:22 + 30.047450 + -91.595200 + + + 2002-05-25 18:15:04 + 30.047800 + -91.594767 + 2.000000 + + + 2002-05-25 18:16:14 + 30.048250 + -91.594083 + 1.000000 + + + 2002-05-25 18:17:01 + 30.048683 + -91.593800 + 1.000000 + + + 2002-05-25 18:18:07 + 30.049350 + -91.593850 + + + 2002-05-25 18:19:51 + 30.050317 + -91.593983 + 2.000000 + + + 2002-05-25 18:20:39 + 30.050783 + -91.594117 + + + 2002-05-25 18:21:24 + 30.051233 + -91.594367 + + + 2002-05-25 18:22:17 + 30.051800 + -91.594367 + + + 2002-05-25 18:23:18 + 30.052217 + -91.594667 + + + 2002-05-25 18:24:37 + 30.053017 + -91.594683 + + + 2002-05-25 18:28:13 + 30.054867 + -91.595200 + 6.000000 + + + 2002-05-25 18:31:36 + 30.053733 + -91.594933 + 2.000000 + + + 2002-05-25 18:32:56 + 30.053183 + -91.594783 + + + 2002-05-25 18:34:02 + 30.052633 + -91.594833 + + + 2002-05-25 18:36:03 + 30.052450 + -91.595433 + + + 2002-05-25 18:36:48 + 30.052483 + -91.595967 + + + 2002-05-25 18:37:52 + 30.052650 + -91.596783 + 1.000000 + + + 2002-05-25 18:39:18 + 30.053133 + -91.597850 + + + 2002-05-25 18:40:15 + 30.053617 + -91.597967 + + + 2002-05-25 18:41:25 + 30.053967 + -91.597767 + 6.000000 + + + 2002-05-25 18:42:37 + 30.053617 + -91.598083 + + + 2002-05-25 18:44:01 + 30.053200 + -91.597917 + + + 2002-05-25 18:45:53 + 30.052817 + -91.597517 + + + 2002-05-25 18:46:54 + 30.052567 + -91.596933 + + + 2002-05-25 18:47:42 + 30.052333 + -91.596433 + + + 2002-05-25 18:48:41 + 30.052250 + -91.595683 + + + 2002-05-25 18:49:52 + 30.052217 + -91.595017 + + + 2002-05-25 18:50:49 + 30.051883 + -91.594700 + + + 2002-05-25 18:52:14 + 30.051050 + -91.594400 + + + 2002-05-25 18:52:56 + 30.050567 + -91.594233 + + + 2002-05-25 18:53:38 + 30.050183 + -91.594100 + + + 2002-05-25 18:55:11 + 30.049100 + -91.593717 + + + 2002-05-25 18:56:32 + 30.048450 + -91.594250 + + + 2002-05-25 18:57:24 + 30.048083 + -91.594750 + + + 2002-05-25 18:58:40 + 30.047500 + -91.595450 + 7.000000 + + + 2002-05-25 18:59:28 + 30.047067 + -91.596000 + + + 2002-05-25 19:00:22 + 30.046633 + -91.596600 + + + 2002-05-25 19:01:41 + 30.046400 + -91.597650 + + + 2002-05-25 19:02:48 + 30.046233 + -91.598467 + + + 2002-05-25 19:03:43 + 30.046317 + -91.598967 + + + 2002-05-25 19:04:49 + 30.046783 + -91.599283 + + + 2002-05-25 19:05:57 + 30.047133 + -91.599667 + + + + 2002-05-25 17:06:21 + 30.062183 + -91.610350 + 1.000000 + + + 2002-05-25 17:09:55 + 30.062783 + -91.610567 + + + 2002-05-25 17:12:00 + 30.062700 + -91.608267 + + + 2002-05-25 17:12:48 + 30.062333 + -91.607383 + + + 2002-05-25 17:14:41 + 30.061533 + -91.605283 + + + 2002-05-25 17:17:16 + 30.059783 + -91.599400 + + + 2002-05-25 17:17:46 + 30.057800 + -91.596683 + + + 2002-05-25 17:18:20 + 30.055383 + -91.594900 + + + 2002-05-25 17:19:01 + 30.053883 + -91.592617 + + + 2002-05-25 17:20:46 + 30.049733 + -91.589750 + + + 2002-05-25 17:21:10 + 30.049017 + -91.589883 + + + 2002-05-25 17:21:51 + 30.048800 + -91.592933 + + + 2002-05-25 17:22:35 + 30.046233 + -91.596450 + + + 2002-05-25 17:23:08 + 30.045517 + -91.598717 + + + 2002-05-25 18:04:23 + 30.047300 + -91.600267 + + + 2002-05-25 18:06:04 + 30.047000 + -91.599633 + 2.000000 + + + 2002-05-25 18:07:06 + 30.046433 + -91.599467 + + + 2002-05-25 18:08:18 + 30.046200 + -91.598950 + 1.000000 + + + 2002-05-25 18:10:20 + 30.046367 + -91.597733 + + + 2002-05-25 18:11:09 + 30.046350 + -91.597167 + + + 2002-05-25 18:12:18 + 30.046783 + -91.596333 + + + 2002-05-25 18:14:22 + 30.047450 + -91.595200 + + + 2002-05-25 18:15:04 + 30.047800 + -91.594767 + 2.000000 + + + 2002-05-25 18:16:14 + 30.048250 + -91.594083 + 1.000000 + + + 2002-05-25 18:17:01 + 30.048683 + -91.593800 + 1.000000 + + + 2002-05-25 18:18:07 + 30.049350 + -91.593850 + + + 2002-05-25 18:19:51 + 30.050317 + -91.593983 + 2.000000 + + + 2002-05-25 18:20:39 + 30.050783 + -91.594117 + + + 2002-05-25 18:21:24 + 30.051233 + -91.594367 + + + 2002-05-25 18:22:17 + 30.051800 + -91.594367 + + + 2002-05-25 18:23:18 + 30.052217 + -91.594667 + + + 2002-05-25 18:24:37 + 30.053017 + -91.594683 + + + 2002-05-25 18:28:13 + 30.054867 + -91.595200 + 6.000000 + + + 2002-05-25 18:31:36 + 30.053733 + -91.594933 + 2.000000 + + + 2002-05-25 18:32:56 + 30.053183 + -91.594783 + + + 2002-05-25 18:34:02 + 30.052633 + -91.594833 + + + 2002-05-25 18:36:03 + 30.052450 + -91.595433 + + + 2002-05-25 18:36:48 + 30.052483 + -91.595967 + + + 2002-05-25 18:37:52 + 30.052650 + -91.596783 + 1.000000 + + + 2002-05-25 18:39:18 + 30.053133 + -91.597850 + + + 2002-05-25 18:40:15 + 30.053617 + -91.597967 + + + 2002-05-25 18:41:25 + 30.053967 + -91.597767 + 6.000000 + + + 2002-05-25 18:42:37 + 30.053617 + -91.598083 + + + 2002-05-25 18:44:01 + 30.053200 + -91.597917 + + + 2002-05-25 18:45:53 + 30.052817 + -91.597517 + + + 2002-05-25 18:46:54 + 30.052567 + -91.596933 + + + 2002-05-25 18:47:42 + 30.052333 + -91.596433 + + + 2002-05-25 18:48:41 + 30.052250 + -91.595683 + + + 2002-05-25 18:49:52 + 30.052217 + -91.595017 + + + 2002-05-25 18:50:49 + 30.051883 + -91.594700 + + + 2002-05-25 18:52:14 + 30.051050 + -91.594400 + + + 2002-05-25 18:52:56 + 30.050567 + -91.594233 + + + 2002-05-25 18:53:38 + 30.050183 + -91.594100 + + + 2002-05-25 18:55:11 + 30.049100 + -91.593717 + + + 2002-05-25 18:56:32 + 30.048450 + -91.594250 + + + 2002-05-25 18:57:24 + 30.048083 + -91.594750 + + + 2002-05-25 18:58:40 + 30.047500 + -91.595450 + 7.000000 + + + 2002-05-25 18:59:28 + 30.047067 + -91.596000 + + + 2002-05-25 19:00:22 + 30.046633 + -91.596600 + + + 2002-05-25 19:01:41 + 30.046400 + -91.597650 + + + 2002-05-25 19:02:48 + 30.046233 + -91.598467 + + + 2002-05-25 19:03:43 + 30.046317 + -91.598967 + + + 2002-05-25 19:04:49 + 30.046783 + -91.599283 + + + 2002-05-25 19:05:57 + 30.047133 + -91.599667 + + + 5066 + Crossing + 42.438878 + -71.119277 + + FAFFB4 + FF8000 + + + + 5067 + Dot + 42.439227 + -71.119689 + + FAFFB4 + FF8000 + + + + 5096 + Dot + 42.438917 + -71.116146 + + FAFFB4 + FF8000 + + + + 5142 + Dot + 42.443904 + -71.122044 + + FAFFB4 + FF8000 + + + + 5156 + Dot + 42.447298 + -71.121447 + + FAFFB4 + FF8000 + + + + 5224 + Dot + 42.454873 + -71.125094 + + FAFFB4 + FF8000 + + + + 5229 + Dot + 42.459079 + -71.124988 + + FAFFB4 + FF8000 + + + + 5237 + Dot + 42.456979 + -71.124474 + + FAFFB4 + FF8000 + + + + 5254 + Dot + 42.454401 + -71.120990 + + FAFFB4 + FF8000 + + + + 5258 + Dot + 42.451442 + -71.121746 + + FAFFB4 + FF8000 + + + + 5264 + Dot + 42.454404 + -71.120660 + + FAFFB4 + FF8000 + + + + 526708 + Dot + 42.457761 + -71.121045 + + FAFFB4 + FF8000 + + + + 526750 + Dot + 42.457089 + -71.120313 + + FAFFB4 + FF8000 + + + + 527614 + Dot + 42.456592 + -71.119676 + + FAFFB4 + FF8000 + + + + 527631 + Dot + 42.456252 + -71.119356 + + FAFFB4 + FF8000 + + + + 5278 + Dot + 42.458148 + -71.119135 + + FAFFB4 + FF8000 + + + + 5289 + Dot + 42.459377 + -71.117693 + + FAFFB4 + FF8000 + + + + 5374FIRE + Dot + 42.464183 + -71.119828 + + FAFFB4 + FF8000 + + + + 5376 + Dot + 42.465650 + -71.119399 + + FAFFB4 + FF8000 + + + + 6006 + Dot + 42.439018 + -71.114456 + + FAFFB4 + FF8000 + + + + 6006BLUE + Dot + 42.438594 + -71.114803 + + FAFFB4 + FF8000 + + + + 6014MEADOW + Dot + 42.436757 + -71.113223 + + FAFFB4 + FF8000 + + + + 6029 + Dot + 42.441754 + -71.113220 + + FAFFB4 + FF8000 + + + + 6053 + Dot + 42.436243 + -71.109075 + + FAFFB4 + FF8000 + + + + 6066 + Dot + 42.439250 + -71.107500 + + FAFFB4 + FF8000 + + + + 6067 + Dot + 42.439764 + -71.107582 + + FAFFB4 + FF8000 + + + + 6071 + Dot + 42.434766 + -71.105874 + + FAFFB4 + FF8000 + + + + 6073 + Dot + 42.433304 + -71.106599 + + FAFFB4 + FF8000 + + + + 6084 + Dot + 42.437338 + -71.104772 + + FAFFB4 + FF8000 + + + + 6130 + Dot + 42.442196 + -71.110975 + + FAFFB4 + FF8000 + + + + 6131 + Dot + 42.442981 + -71.111441 + + FAFFB4 + FF8000 + + + + 6153 + Dot + 42.444773 + -71.108882 + + FAFFB4 + FF8000 + + + + 6171 + Dot + 42.443592 + -71.106301 + + FAFFB4 + FF8000 + + + + 6176 + Dot + 42.447804 + -71.106624 + + FAFFB4 + FF8000 + + + + 6177 + Dot + 42.448448 + -71.106158 + + FAFFB4 + FF8000 + + + + 6272 + Dot + 42.453415 + -71.106783 + + FAFFB4 + FF8000 + + + + 6272 + Dot + 42.453434 + -71.107253 + + FAFFB4 + FF8000 + + + + 6278 + Dot + 42.458298 + -71.106771 + + FAFFB4 + FF8000 + + + + 6280 + Dot + 42.451430 + -71.105413 + + FAFFB4 + FF8000 + + + + 6283 + Dot + 42.453845 + -71.105206 + + FAFFB4 + FF8000 + + + + 6289 + Dot + 42.459986 + -71.106170 + + FAFFB4 + FF8000 + + + + 6297 + Dot + 42.457616 + -71.105116 + + FAFFB4 + FF8000 + + + + 6328 + Dot + 42.467110 + -71.113574 + + FAFFB4 + FF8000 + + + + 6354 + Dot + 42.464202 + -71.109863 + + FAFFB4 + FF8000 + + + + 635722 + Dot + 42.466459 + -71.110067 + + FAFFB4 + FF8000 + + + + 635783 + Dot + 42.466557 + -71.109410 + + FAFFB4 + FF8000 + + + + 6373 + Dot + 42.463495 + -71.107117 + + FAFFB4 + FF8000 + + + + 6634 + Dot + 42.401051 + -71.110241 + + FAFFB4 + FF8000 + + + + 6979 + Dot + 42.432621 + -71.106532 + + FAFFB4 + FF8000 + + + + 6997 + Dot + 42.431033 + -71.107883 + + FAFFB4 + FF8000 + + + + BEAR HILL + Tall Tower + 42.465687 + -71.107360 + + FAFFB4 + FF8000 + + + + BELLEVUE + Parking Area + 42.430950 + -71.107628 + + FAFFB4 + FF8000 + + + + 6016 + Waypoint + 42.438666 + -71.114079 + + FAFFB4 + FF8000 + + + + 5236BRIDGE + Bridge + 42.456469 + -71.124651 + + FAFFB4 + FF8000 + + + + 5376BRIDGE + Bridge + 42.465759 + -71.119815 + + FAFFB4 + FF8000 + + + + 6181CROSS + Crossing + 42.442993 + -71.105878 + + FAFFB4 + FF8000 + + + + 6042CROSS + Crossing + 42.435472 + -71.109664 + + FAFFB4 + FF8000 + + + + DARKHOLLPO + Fishing Area + 42.458516 + -71.103646 + + FAFFB4 + FF8000 + + + + 6121DEAD + Danger Area + 42.443109 + -71.112675 + + FAFFB4 + FF8000 + + + + 5179DEAD + Danger Area + 42.449866 + -71.119298 + + FAFFB4 + FF8000 + + + + 5299DEAD + Danger Area + 42.459629 + -71.116524 + + FAFFB4 + FF8000 + + + + 5376DEAD + Danger Area + 42.465485 + -71.119148 + + FAFFB4 + FF8000 + + + + 6353DEAD + Danger Area + 42.462776 + -71.109986 + + FAFFB4 + FF8000 + + + + 6155DEAD + Danger Area + 42.446793 + -71.108784 + + FAFFB4 + FF8000 + + + + GATE14 + Truck Stop + 42.451204 + -71.126602 + + FAFFB4 + FF8000 + + + + GATE16 + Truck Stop + 42.458499 + -71.122078 + + FAFFB4 + FF8000 + + + + GATE17 + Truck Stop + 42.459376 + -71.119238 + + FAFFB4 + FF8000 + + + + GATE19 + Truck Stop + 42.466353 + -71.119240 + + FAFFB4 + FF8000 + + + + GATE21 + Truck Stop + 42.468655 + -71.107697 + + FAFFB4 + FF8000 + + + + GATE24 + Truck Stop + 42.456718 + -71.102973 + + FAFFB4 + FF8000 + + + + GATE5 + Truck Stop + 42.430847 + -71.107690 + + FAFFB4 + FF8000 + + + + GATE6 + Waypoint + 42.431240 + -71.109236 + + FAFFB4 + FF8000 + + + + 6077LOGS + Amusement Park + 42.439502 + -71.106556 + + FAFFB4 + FF8000 + + + + 5148NANEPA + Waypoint + 42.449765 + -71.122320 + + FAFFB4 + FF8000 + + + + 5267OBSTAC + Amusement Park + 42.457388 + -71.119845 + + FAFFB4 + FF8000 + + + + PANTHRCAVE + Tunnel + 42.434980 + -71.109942 + + FAFFB4 + FF8000 + + + + 5252PURPLE + Summit + 42.453256 + -71.121211 + + FAFFB4 + FF8000 + + + + 5287WATER + Swimming Area + 42.457734 + -71.117481 + + FAFFB4 + FF8000 + + + + 5239ROAD + Truck Stop + 42.459278 + -71.124574 + + FAFFB4 + FF8000 + + + + 5278ROAD + Truck Stop + 42.458782 + -71.118991 + + FAFFB4 + FF8000 + + + + 5058ROAD + Dot + 42.439993 + -71.120925 + + FAFFB4 + FF8000 + + + + SHEEPFOLD + Parking Area + 42.453415 + -71.106782 + + FAFFB4 + FF8000 + + + + SOAPBOX + Cemetery + 42.455956 + -71.107483 + + FAFFB4 + FF8000 + + + + 5376STREAM + Bridge + 42.465913 + -71.119328 + + FAFFB4 + FF8000 + + + + 5144SUMMIT + Summit + 42.445359 + -71.122845 + + FAFFB4 + FF8000 + + + + 5150TANK + Museum + 42.441727 + -71.121676 + + FAFFB4 + FF8000 + + + diff --git a/trackfilter.cc b/trackfilter.cc index 8a5ec100b..2c3682cc9 100644 --- a/trackfilter.cc +++ b/trackfilter.cc @@ -230,7 +230,7 @@ void TrackFilter::trackfilter_minpoint_list_cb(const route_head* track) * track title producers *******************************************************************************/ -void TrackFilter::trackfilter_split_init_rte_name(route_head* track, const QDateTime& dt) +void TrackFilter::trackfilter_split_init_rte_name(route_head* track, const gpsbabel::DateTime& dt) { QString datetimestring; @@ -259,12 +259,12 @@ void TrackFilter::trackfilter_split_init_rte_name(route_head* track, const QDate } } -void TrackFilter::trackfilter_pack_init_rte_name(route_head* track, const QDateTime& default_time) +void TrackFilter::trackfilter_pack_init_rte_name(route_head* track, const gpsbabel::DateTime& default_time) { if (strchr(opt_title, '%') != nullptr) { // Uggh. strftime format exposed to user. - QDateTime dt; + gpsbabel::DateTime dt; if (track->rte_waypt_ct == 0) { dt = default_time; } else { diff --git a/trackfilter.h b/trackfilter.h index 078991f1f..82b3b8848 100644 --- a/trackfilter.h +++ b/trackfilter.h @@ -187,8 +187,8 @@ private: void trackfilter_fill_track_list_cb(const route_head* track); /* callback for track_disp_all */ void trackfilter_minpoint_list_cb(const route_head* track); - void trackfilter_split_init_rte_name(route_head* track, const QDateTime& dt); - void trackfilter_pack_init_rte_name(route_head* track, const QDateTime& default_time); + void trackfilter_split_init_rte_name(route_head* track, const gpsbabel::DateTime& dt); + void trackfilter_pack_init_rte_name(route_head* track, const gpsbabel::DateTime& default_time); void trackfilter_title(); -- 2.30.2